diff --git a/.changeset/plenty-pugs-tease.md b/.changeset/plenty-pugs-tease.md new file mode 100644 index 000000000..f65015bf3 --- /dev/null +++ b/.changeset/plenty-pugs-tease.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +Experimental filters: adjust popover UI diff --git a/package-lock.json b/package-lock.json index ae5686eb2..3833e3c66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@material-ui/lab": "^4.0.0-alpha.61", "@material-ui/styles": "^4.11.4", "@reach/auto-id": "^0.16.0", - "@saleor/macaw-ui": "0.8.0-pre.104", + "@saleor/macaw-ui": "0.8.0-pre.105", "@saleor/sdk": "0.6.0", "@sentry/react": "^6.0.0", "@types/faker": "^5.1.6", @@ -7947,9 +7947,9 @@ } }, "node_modules/@saleor/macaw-ui": { - "version": "0.8.0-pre.104", - "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.8.0-pre.104.tgz", - "integrity": "sha512-5Et/UIsH6ZzVyJLMhhnbN5PDllRGhyhJXBXUlgOdD0yH47+PPeaN9BPDDrlX/eiJbLMimJOIuj5hhb+WhWT/Zw==", + "version": "0.8.0-pre.105", + "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.8.0-pre.105.tgz", + "integrity": "sha512-UfI8NWknBCEJfFakQM71W5DghQZZT+WNU4C0t/A6xHxQQj8qOxoilOeFy+e7rqtovx3x0tkcWIlVy2TTbuJDKg==", "dependencies": { "@dessert-box/react": "^0.4.0", "@floating-ui/react-dom-interactions": "^0.5.0", @@ -41209,9 +41209,9 @@ } }, "@saleor/macaw-ui": { - "version": "0.8.0-pre.104", - "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.8.0-pre.104.tgz", - "integrity": "sha512-5Et/UIsH6ZzVyJLMhhnbN5PDllRGhyhJXBXUlgOdD0yH47+PPeaN9BPDDrlX/eiJbLMimJOIuj5hhb+WhWT/Zw==", + "version": "0.8.0-pre.105", + "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-0.8.0-pre.105.tgz", + "integrity": "sha512-UfI8NWknBCEJfFakQM71W5DghQZZT+WNU4C0t/A6xHxQQj8qOxoilOeFy+e7rqtovx3x0tkcWIlVy2TTbuJDKg==", "requires": { "@dessert-box/react": "^0.4.0", "@floating-ui/react-dom-interactions": "^0.5.0", diff --git a/package.json b/package.json index 97ddf737f..5db371856 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@material-ui/lab": "^4.0.0-alpha.61", "@material-ui/styles": "^4.11.4", "@reach/auto-id": "^0.16.0", - "@saleor/macaw-ui": "0.8.0-pre.104", + "@saleor/macaw-ui": "0.8.0-pre.105", "@saleor/sdk": "0.6.0", "@sentry/react": "^6.0.0", "@types/faker": "^5.1.6", @@ -278,7 +278,7 @@ "^@material-ui/core$": "/node_modules/@material-ui/core", "^@material-ui/icons$": "/node_modules/@material-ui/icons", "^@material-ui/styles$": "/node_modules/@material-ui/styles", - "^@saleor/macaw-ui/next$": "/node_modules/@saleor/macaw-ui/dist/macaw-ui.cjs", + "^@saleor/macaw-ui/next$": "/node_modules/@saleor/macaw-ui/dist/macaw-ui.js", "^react$": "/node_modules/react", "^react-dom$": "/node_modules/react-dom" } diff --git a/src/components/AppLayout/ListFilters/components/ExpressionFilters.tsx b/src/components/AppLayout/ListFilters/components/ExpressionFilters.tsx index 0ae82fd2d..71833812b 100644 --- a/src/components/AppLayout/ListFilters/components/ExpressionFilters.tsx +++ b/src/components/AppLayout/ListFilters/components/ExpressionFilters.tsx @@ -1,5 +1,5 @@ import { ConditionalFilters } from "@dashboard/components/ConditionalFilter"; -import { Box, Button, Popover } from "@saleor/macaw-ui/next"; +import { Box, Button, CloseIcon, Popover, Text } from "@saleor/macaw-ui/next"; import React from "react"; export const ExpressionFilters = () => ( @@ -8,8 +8,26 @@ export const ExpressionFilters = () => ( - - + + + + Filter conditions + + + + +