Skip to content

Commit

Permalink
Merge branch 'main' into labl-on-side
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm committed Nov 11, 2022
2 parents 088acc2 + 7d6dcb7 commit 894dbe7
Show file tree
Hide file tree
Showing 22 changed files with 1,187 additions and 1,143 deletions.
5 changes: 5 additions & 0 deletions .changeset/lazy-dots-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marigold/system": patch
---

chore(deps): update dependency @theme-ui/css to v0.15.4
6 changes: 6 additions & 0 deletions .changeset/lucky-moles-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@marigold/docs": patch
"@marigold/types": patch
---

chore(deps): update dependency @types/react to v18.0.25
5 changes: 5 additions & 0 deletions .changeset/quiet-countries-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@marigold/components": patch
---

fix: set `<Switch>` width in flex so it doesn't shrink below a certain threshold
8 changes: 8 additions & 0 deletions .changeset/three-jars-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@marigold/eslint-config": patch
"@marigold/jest-config": patch
"@marigold/storybook-config": patch
"@marigold/system": patch
---

chore(deps): update babel monorepo
4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
{
"matchPackagePatterns": ["jest", "testing-library"],
"groupName": "testing"
},
{
"matchPackagePatterns": ["rehype", "remark", "mdx"],
"groupName": "mdx"
}
],
"schedule": ["before 3am on the first day of the month"],
Expand Down
4 changes: 2 additions & 2 deletions config/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"directory": "config/eslint"
},
"dependencies": {
"@babel/core": "7.19.6",
"@babel/core": "7.20.2",
"@babel/eslint-parser": "^7.18.9",
"@babel/plugin-syntax-flow": "^7.16.7",
"@babel/plugin-transform-react-jsx": "^7.17.3",
Expand All @@ -29,7 +29,7 @@
"eslint-config-react-app": "7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jest": "27.1.3",
"eslint-plugin-jest": "27.1.5",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.31.10",
Expand Down
10 changes: 5 additions & 5 deletions config/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"directory": "config/jest"
},
"dependencies": {
"@babel/core": "7.19.6",
"@swc/core": "1.3.11",
"@babel/core": "7.20.2",
"@swc/core": "1.3.14",
"@swc/jest": "0.2.23",
"@types/jest": "29.2.1",
"babel-jest": "29.2.2",
"@types/jest": "29.2.2",
"babel-jest": "29.3.1",
"find-up": "5.0.0",
"jest-watch-typeahead": "2.2.0",
"merge-deep": "3.0.3",
Expand All @@ -39,7 +39,7 @@
"typescript": "4.x"
},
"devDependencies": {
"jest": "29.2.2",
"jest": "29.3.1",
"react": "18.2.0",
"typescript": "4.8.4"
}
Expand Down
4 changes: 2 additions & 2 deletions config/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"directory": "config/prettier"
},
"dependencies": {
"@babel/core": "7.19.6",
"@babel/core": "7.20.2",
"@emotion/react": "^11.0.0-rc.0",
"@emotion/styled": "^11.8.1",
"@marigold/components": "workspace:*",
Expand All @@ -33,7 +33,7 @@
"@storybook/jest": "0.0.10",
"@storybook/testing-library": "0.0.13",
"@types/react": "18",
"babel-loader": "8.2.5",
"babel-loader": "8.3.0",
"chromatic": "^6.6.3",
"find-up": "5.0.0",
"tsconfig-paths-webpack-plugin": "4.0.0",
Expand Down
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
"@marigold/types": "workspace:*",
"@mdx-js/loader": "2.1.5",
"@mdx-js/react": "1.6.22",
"@next/mdx": "13.0.1",
"@next/mdx": "12.3.1",
"estree-util-visit": "1.2.0",
"fs-extra": "10.1.0",
"globby": "13.1.2",
"mdast-util-from-markdown": "1.2.0",
"mdast-util-mdx": "2.0.0",
"mdast-util-toc": "6.1.0",
"micromark-extension-mdxjs": "1.0.0",
"next": "13.0.1",
"next": "12.3.1",
"prism-react-renderer": "1.3.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-use": "17.4.0",
"recma-nextjs-static-props": "1.0.0",
"rehype-autolink-headings": "6.1.1",
"rehype-slug": "5.0.1",
"rehype-slug": "5.1.0",
"remark-frontmatter": "4.0.1",
"remark-gfm": "3.0.1",
"remark-mdx-code-meta": "2.0.0",
"remark-mdx-frontmatter": "2.0.3",
"remark-mdx-frontmatter": "2.1.1",
"to-vfile": "7.2.3",
"unified": "10.1.2",
"unist-util-visit": "4.1.1",
Expand All @@ -48,7 +48,7 @@
"devDependencies": {
"@types/mdx-js__react": "1.5.5",
"@types/node": "18.0.0",
"@types/react": "18.0.24",
"@types/react": "18.0.25",
"typescript": "4.8.4"
}
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"packageManager": "pnpm@7.14.0",
"dependencies": {
"@babel/core": "7.19.6",
"@babel/core": "7.20.2",
"@changesets/changelog-github": "0.4.7",
"@changesets/cli": "2.25.2",
"@manypkg/get-packages": "1.1.3",
Expand All @@ -23,19 +23,19 @@
"@testing-library/react": "13.4.0",
"@testing-library/react-hooks": "8.0.1",
"@testing-library/user-event": "14.4.3",
"@types/node": "16.11.68",
"@types/node": "16.18.3",
"all-contributors-cli": "6.24.0",
"async-retry": "1.3.3",
"dotenv": "16.0.2",
"eslint": "8.26.0",
"husky": "8.0.1",
"jest": "29.2.2",
"jest-environment-jsdom": "29.2.2",
"husky": "8.0.2",
"jest": "29.3.1",
"jest-environment-jsdom": "29.3.1",
"prettier": "2.7.1",
"pretty-quick": "3.1.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"slack-notify": "2.0.3",
"slack-notify": "2.0.4",
"typescript": "4.8.4",
"workspaces-run": "1.0.1",
"zx": "7.0.8"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@marigold/tsconfig": "workspace:*",
"react": "18.2.0",
"react-dom": "18.2.0",
"tsup": "6.3.0"
"tsup": "6.4.0"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/Switch/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const Switch = forwardRef<HTMLInputElement, SwitchProps>(
height: 24,
bg: '#dee2e6',
borderRadius: 20,
flex: '0 0 48px',
}}
css={styles.track}
{...stateProps}
Expand Down
48 changes: 48 additions & 0 deletions packages/components/src/Table/Table.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,51 @@ test('cursor indicates interactivity', async () => {
expect(rows[1]).toHaveStyle('cursor: pointer');
expect(rows[2]).toHaveStyle('cursor: default');
});

test('Table cell mouse down will not be selectable', () => {
render(
<Table aria-label="table" selectionMode="none">
<Table.Header>
<Table.Column>Name</Table.Column>
</Table.Header>
<Table.Body>
<Table.Row key="Alice">
<Table.Cell key="cell">Alice</Table.Cell>
</Table.Row>
<Table.Row key="Jane">
<Table.Cell>Jane</Table.Cell>
</Table.Row>
</Table.Body>
</Table>
);

const cell = screen.getByText('Alice');
fireEvent.mouseDown(cell);

const row = screen.getAllByRole('row');
expect(row[0]).not.toHaveAttribute('aria-selected');
});

test('Table cell pointer down will not be selectable', () => {
render(
<Table aria-label="table" selectionMode="none">
<Table.Header>
<Table.Column>Name</Table.Column>
</Table.Header>
<Table.Body>
<Table.Row key="Alice">
<Table.Cell key="cell">Alice</Table.Cell>
</Table.Row>
<Table.Row key="Jane">
<Table.Cell>Jane</Table.Cell>
</Table.Row>
</Table.Body>
</Table>
);

const cell = screen.getByText('Alice');
fireEvent.pointerDown(cell);

const row = screen.getAllByRole('row');
expect(row[0]).not.toHaveAttribute('aria-selected');
});
2 changes: 1 addition & 1 deletion packages/create-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@marigold/components": "workspace:*",
"@marigold/system": "workspace:*",
"@marigold/tsconfig": "workspace:*",
"tsup": "6.3.0"
"tsup": "6.4.0"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "6.3.0"
"tsup": "6.4.0"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
6 changes: 3 additions & 3 deletions packages/system/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@emotion/react": "11.10.5",
"@marigold/types": "workspace:*",
"@theme-ui/css": "0.14.7",
"@theme-ui/css": "0.15.4",
"csstype": "3.1.1",
"deepmerge": "^4.2.2",
"react-fast-compare": "^3.2.0"
Expand All @@ -38,10 +38,10 @@
"react-dom": "16.x || 17.x || 18.x"
},
"devDependencies": {
"@babel/core": "7.19.6",
"@babel/core": "7.20.2",
"@marigold/tsconfig": "workspace:*",
"react": "18.2.0",
"tsup": "6.3.0"
"tsup": "6.4.0"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@marigold/tsconfig": "workspace:*",
"tsup": "6.3.0"
"tsup": "6.4.0"
},
"scripts": {
"build": "tsup src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/react": "17.x || 18.x"
},
"devDependencies": {
"@types/react": "18.0.24"
"@types/react": "18.0.25"
},
"scripts": {
"build": "echo types only",
Expand Down
Loading

0 comments on commit 894dbe7

Please sign in to comment.