Skip to content

Commit

Permalink
Merge branch 'master' into 6261/fix-delete-alert
Browse files Browse the repository at this point in the history
  • Loading branch information
timleslie authored Aug 17, 2021
2 parents ffee7a1 + f3014a6 commit b9d1f2d
Show file tree
Hide file tree
Showing 41 changed files with 618 additions and 193 deletions.
5 changes: 5 additions & 0 deletions .changeset/dirty-cheetahs-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-next/keystone': patch
---

Resolved bug with visually hidden elements in ListView checkboxes expanding to fill the whole body on click of elements near the bottom of the screen.
2 changes: 1 addition & 1 deletion .changeset/lemon-phones-turn.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"@keystone-next/keystone": patch
---

Updated Prisma dependencies to `2.29.0`.
Updated Prisma dependencies to `2.29.1`.
4 changes: 2 additions & 2 deletions design-system/packages/button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "dist/button.cjs.js",
"module": "dist/button.esm.js",
"devDependencies": {
"@types/react": "^17.0.16"
"@types/react": "^17.0.18"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/icons": "^4.0.0",
"@keystone-ui/loading": "^4.0.0",
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "dist/core.cjs.js",
"module": "dist/core.esm.js",
"devDependencies": {
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
Expand All @@ -14,7 +14,7 @@
"react-dom": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@emotion/react": "^11.4.1",
"@types/facepaint": "^1.2.2",
"facepaint": "^1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/fields/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "dist/fields.cjs.js",
"module": "dist/fields.esm.js",
"devDependencies": {
"@types/react": "^17.0.16"
"@types/react": "^17.0.18"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.1.0",
"@keystone-ui/icons": "^4.0.0",
"@keystone-ui/popover": "^4.0.2",
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@svgr/plugin-jsx": "^5.5.0",
"@svgr/plugin-prettier": "^5.5.0",
"@svgr/plugin-svgo": "^5.5.0",
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"chalk": "^4.1.2",
"feather-icons": "^4.28.0",
"fs-extra": "^10.0.0",
Expand All @@ -21,7 +21,7 @@
"to-pascal-case": "^1.0.0"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/loading/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "dist/loading.cjs.js",
"module": "dist/loading.esm.js",
"devDependencies": {
"@types/react": "^17.0.16"
"@types/react": "^17.0.18"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"react": "^17.0.2"
},
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/modals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "dist/modals.cjs.js",
"module": "dist/modals.esm.js",
"devDependencies": {
"@types/react": "^17.0.16"
"@types/react": "^17.0.18"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/button": "^5.0.0",
"@keystone-ui/core": "^3.0.0",
"react": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/notice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"main": "dist/notice.cjs.js",
"module": "dist/notice.esm.js",
"devDependencies": {
"@types/react": "^17.0.16"
"@types/react": "^17.0.18"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/button": "^5.0.0",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/icons": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion design-system/packages/options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"react": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/fields": "^4.1.2",
"@keystone-ui/icons": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion design-system/packages/pill/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"react": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/icons": "^4.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/popover/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"react-dom": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@popperjs/core": "^2.9.3",
"focus-trap": "^6.6.0",
"focus-trap": "^6.6.1",
"react-popper": "^2.2.5"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/segmented-control/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"main": "dist/segmented-control.cjs.js",
"module": "dist/segmented-control.esm.js",
"devDependencies": {
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"react": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.1.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions design-system/packages/toast/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"main": "dist/toast.cjs.js",
"module": "dist/toast.esm.js",
"devDependencies": {
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"react": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/icons": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion design-system/packages/tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"react-dom": "^17.0.2"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/popover": "^4.0.0",
"apply-ref": "^1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions design-system/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dev": "next -p 8080"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@keystone-ui/button": "^5.0.0",
"@keystone-ui/core": "^3.0.0",
"@keystone-ui/fields": "^4.1.2",
Expand All @@ -21,7 +21,7 @@
"@keystone-ui/toast": "^4.0.1",
"@keystone-ui/tooltip": "^4.0.0",
"@preconstruct/next": "^3.0.0",
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"@types/react-dom": "^17.0.9",
"@types/tinycolor2": "^1.4.3",
"@types/webpack": "^4.41.30",
Expand Down
32 changes: 15 additions & 17 deletions docs/components/docs/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,28 +136,22 @@ export function DocsNavigation() {
<NavItem href="/docs/guides/keystone-5-vs-keystone-6-preview">Keystone 5 vs 6</NavItem>
<NavItem href="/docs/guides/cli">Command Line</NavItem>
<NavItem href="/docs/guides/relationships">Relationships</NavItem>
<NavItem href="/docs/guides/filters">Query Filters</NavItem>
<NavItem href="/docs/guides/filters">
Query Filters <Badge look="success">Updated</Badge>
</NavItem>
<NavItem href="/docs/guides/hooks">Hooks</NavItem>
<NavItem href="/docs/guides/document-fields">Document Fields</NavItem>
<NavItem href="/docs/guides/document-field-demo">Document Field Demo</NavItem>
<NavItem href="/docs/guides/virtual-fields">
Virtual Fields <Badge look="success">New</Badge>
</NavItem>
<NavItem href="/docs/guides/testing">
Testing <Badge look="success">New</Badge>
</NavItem>
<NavItem href="/docs/guides/virtual-fields">Virtual Fields</NavItem>
<NavItem href="/docs/guides/testing">Testing</NavItem>
<NavItem href="/docs/guides/custom-fields">
Custom Fields <Badge look="success">New</Badge>
</NavItem>
<NavItem href="/docs/guides/custom-admin-ui-logo">
Custom Admin UI Logo <Badge look="success">New</Badge>
Custom Fields <Badge look="success">Updated</Badge>
</NavItem>
<NavItem href="/docs/guides/custom-admin-ui-logo">Custom Admin UI Logo</NavItem>
<NavItem href="/docs/guides/custom-admin-ui-pages">
Custom Admin UI Pages <Badge look="success">New</Badge>
</NavItem>
<NavItem href="/docs/guides/custom-admin-ui-navigation">
Custom Admin UI Navigation <Badge look="success">New</Badge>
Custom Admin UI Pages <Badge look="success">Updated</Badge>
</NavItem>
<NavItem href="/docs/guides/custom-admin-ui-navigation">Custom Admin UI Navigation</NavItem>
<NavItem href="/docs/guides/access-control" isPlaceholder>
Access Control
</NavItem>
Expand Down Expand Up @@ -190,8 +184,12 @@ export function DocsNavigation() {
<NavItem href="/docs/apis/db-items">DB Item API</NavItem>

<SubHeading>GraphQL</SubHeading>
<NavItem href="/docs/apis/graphql">GraphQL API</NavItem>
<NavItem href="/docs/apis/filters">Query Filter API</NavItem>
<NavItem href="/docs/apis/graphql">
GraphQL API <Badge look="success">Updated</Badge>
</NavItem>
<NavItem href="/docs/apis/filters">
Query Filter API <Badge look="success">Updated</Badge>
</NavItem>
</Section>
</nav>
);
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"cypress:run:ci": "yarn build && start-server-and-test start http://localhost:8000 cy:run"
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@babel/runtime": "^7.15.3",
"@emotion/cache": "11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/server": "11.4.0",
Expand All @@ -26,7 +26,7 @@
"@sindresorhus/slugify": "^1.1.2",
"@types/gtag.js": "^0.0.7",
"@types/mdx-js__react": "^1.5.4",
"@types/react": "^17.0.16",
"@types/react": "^17.0.18",
"@types/react-dom": "^17.0.9",
"@types/webpack": "^4.41.30",
"classnames": "^2.3.1",
Expand All @@ -45,7 +45,7 @@
"remark-hint": "^1.0.10"
},
"devDependencies": {
"next-sitemap": "^1.6.148",
"next-sitemap": "^1.6.157",
"start-server-and-test": "^1.13.1",
"typescript": "^4.3.5"
},
Expand Down
17 changes: 11 additions & 6 deletions docs/pages/docs/apis/filters.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,26 @@ The `json` field type does not support filters.

### text

| **Filter name** | **Type** | **Description** | **Notes** |
| --------------- | ---------------------------------------- | ----------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
| **Filter name** | **Type** | **Description** | **Notes** |
| --------------- | ---------------------------------------- | ----------------------------------------------------- | --------- |
| `equals` | `String` | Equals |
| `lt` | `String` | Less than |
| `lte` | `String` | Less than or equal |
| `gt` | `String` | Greater than |
| `gte` | `String` | Greater than or equal |
| `contains` | `String` | Contains | Will follow the setting of the `mode` on `postgresql` and will be case insensitive but only for ASCII characters on `sqlite` |
| `startsWith` | `String` | Starts with | Will follow the setting of the `mode` on `postgresql` and will be case insensitive but only for ASCII characters on `sqlite` |
| `endsWith` | `String` | Ends with | Will follow the setting of the `mode` on `postgresql` and will be case insensitive but only for ASCII characters on `sqlite` |
| `contains` | `String` | Contains | [1] |
| `startsWith` | `String` | Starts with | [1] |
| `endsWith` | `String` | Ends with | [1] |
| `in` | `[String!]` | Is in the array |
| `notIn` | `[String!]` | Is not in the array |
| `mode` | `QueryMode` (`default` or `insensitive`) | Whether the filters should be case insensitive or not | `postgresql` only |
| `mode` | `QueryMode` (`default` or `insensitive`) | Whether the filters should be case insensitive or not | [2] |
| `not` | `NestedStringNullableFilter` | Does not match the inner filter |

#### Notes

- [1] Will follow the setting of the `mode` on `postgresql` and will be case insensitive but only for ASCII characters on `sqlite`
- [2] `postgresql` only

### timestamp

| **Filter name** | **Type** | **Description** |
Expand Down
Loading

0 comments on commit b9d1f2d

Please sign in to comment.