djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new tooltip from macaw in filter presets (#3467)

Browse source
This commit is contained in:
Paweł Chyła 2023-04-12 10:07:16 +02:00 committed by GitHub
parent 935c224bb2
commit 548c10676e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 633 additions and 483 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1072
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -33,7 +33,7 @@
"@material-ui/lab": "^4.0.0-alpha.61", "@material-ui/lab": "^4.0.0-alpha.61",
"@material-ui/styles": "^4.11.4", "@material-ui/styles": "^4.11.4",
"@reach/auto-id": "^0.16.0", "@reach/auto-id": "^0.16.0",
"@saleor/macaw-ui": "^0.8.0-pre.64", "@saleor/macaw-ui": "^0.8.0-pre.66",
"@saleor/sdk": "^0.4.6", "@saleor/sdk": "^0.4.6",
"@sentry/react": "^6.0.0", "@sentry/react": "^6.0.0",
"@types/faker": "^5.1.6", "@types/faker": "^5.1.6",

42
src/components/FilterPresetsSelect/FilterPresetsSelect.tsx
View file

@ -1,5 +1,4 @@
import { commonMessages } from "@dashboard/intl"; import { commonMessages } from "@dashboard/intl";
import { Tooltip } from "@saleor/macaw-ui";
import { import {
Box, Box,
Button, Button,
@ -9,6 +8,7 @@ import {
PlusIcon, PlusIcon,
sprinkles, sprinkles,
Text, Text,
Tooltip,
vars, vars,
} from "@saleor/macaw-ui/next"; } from "@saleor/macaw-ui/next";
import React, { MouseEvent } from "react"; import React, { MouseEvent } from "react";
@ -72,10 +72,16 @@ export const FilterPresetsSelect = ({
if (!savedPresets?.length) { if (!savedPresets?.length) {
return ( return (
<Box display="flex" alignItems="center"> <Box display="flex" alignItems="center">
<Tooltip title={intl.formatMessage(messages.noPresets)}> <Tooltip>
<Text variant="title" size="small"> <Tooltip.Trigger>
{selectAllLabel} <Text variant="title" size="small">
</Text> {selectAllLabel}
</Text>
</Tooltip.Trigger>
<Tooltip.Content>
<Tooltip.Arrow />
{intl.formatMessage(messages.noPresets)}
</Tooltip.Content>
</Tooltip> </Tooltip>
</Box> </Box>
); );
@ -179,16 +185,22 @@ export const FilterPresetsSelect = ({
</Button> </Button>
)} )}
{showSaveButton && ( {showSaveButton && (
<Tooltip title={intl.formatMessage(messages.savePreset)}> <Tooltip>
<Button <Tooltip.Trigger>
className={sprinkles({ <Button
marginLeft: 6, className={sprinkles({
})} marginLeft: 6,
icon={<PlusIcon />} })}
onClick={onSave} icon={<PlusIcon />}
variant="secondary" onClick={onSave}
size="small" variant="secondary"
/> size="small"
/>
</Tooltip.Trigger>
<Tooltip.Content>
<Tooltip.Arrow />
{intl.formatMessage(messages.savePreset)}
</Tooltip.Content>
</Tooltip> </Tooltip>
)} )}
</Box> </Box>