Skip to content

Commit

Permalink
fix(DataTable): mock Canvas and remove dependency (#13972)
Browse files Browse the repository at this point in the history
* fix(DataTable): mock Canvas and remove dependency

* fix: trigger change

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
francinelucca and kodiakhq[bot] committed Jun 12, 2023
1 parent 5a76564 commit 67c7aa7
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 76 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"babel-preset-carbon": "^0.5.0",
"browserify-zlib": "^0.2.0",
"browserslist-config-carbon": "^11.2.0",
"canvas": "^2.11.2",
"clipboardy": "^2.1.0",
"css-loader": "^6.5.1",
"enquirer": "^2.3.6",
Expand Down
46 changes: 45 additions & 1 deletion packages/react/src/components/DataTable/__tests__/Table-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ describe('Table', () => {
right: 0,
};
});
HTMLCanvasElement.prototype.getContext = jest.fn(() => {
return {
measureText: () => {
return {
width: 101,
};
},
};
});
render(
<Table experimentalAutoAlign>
<TableHead>
Expand Down Expand Up @@ -131,6 +140,15 @@ describe('Table', () => {
right: 0,
};
});
HTMLCanvasElement.prototype.getContext = jest.fn(() => {
return {
measureText: () => {
return {
width: 100,
};
},
};
});
render(
<Table>
<TableHead>
Expand Down Expand Up @@ -164,6 +182,15 @@ describe('Table', () => {
right: 0,
};
});
HTMLCanvasElement.prototype.getContext = jest.fn(() => {
return {
measureText: () => {
return {
width: 100,
};
},
};
});
render(
<Table experimentalAutoAlign>
<TableHead>
Expand Down Expand Up @@ -197,7 +224,15 @@ describe('Table', () => {
right: 0,
};
});

HTMLCanvasElement.prototype.getContext = jest.fn(() => {
return {
measureText: () => {
return {
width: 100,
};
},
};
});
HTMLDivElement.prototype.getBoundingClientRect = jest.fn(() => {
return {
width: 1,
Expand Down Expand Up @@ -252,6 +287,15 @@ describe('Table', () => {
right: 0,
};
});
HTMLCanvasElement.prototype.getContext = jest.fn(() => {
return {
measureText: () => {
return {
width: 100,
};
},
};
});
render(
<Table experimentalAutoAlign>
<TableHead>
Expand Down
75 changes: 1 addition & 74 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2075,7 +2075,6 @@ __metadata:
babel-preset-carbon: ^0.5.0
browserify-zlib: ^0.2.0
browserslist-config-carbon: ^11.2.0
canvas: ^2.11.2
classnames: 2.3.2
clipboardy: ^2.1.0
copy-to-clipboard: ^3.3.1
Expand Down Expand Up @@ -4369,25 +4368,6 @@ __metadata:
languageName: node
linkType: hard

"@mapbox/node-pre-gyp@npm:^1.0.0":
version: 1.0.10
resolution: "@mapbox/node-pre-gyp@npm:1.0.10"
dependencies:
detect-libc: ^2.0.0
https-proxy-agent: ^5.0.0
make-dir: ^3.1.0
node-fetch: ^2.6.7
nopt: ^5.0.0
npmlog: ^5.0.1
rimraf: ^3.0.2
semver: ^7.3.5
tar: ^6.1.11
bin:
node-pre-gyp: bin/node-pre-gyp
checksum: 1a98db05d955b74dad3814679593df293b9194853698f3f5f1ed00ecd93128cdd4b14fb8767fe44ac6981ef05c23effcfdc88710e7c1de99ccb6f647890597c8
languageName: node
linkType: hard

"@mdx-js/mdx@npm:^1.6.22":
version: 1.6.22
resolution: "@mdx-js/mdx@npm:1.6.22"
Expand Down Expand Up @@ -11269,18 +11249,6 @@ __metadata:
languageName: node
linkType: hard

"canvas@npm:^2.11.2":
version: 2.11.2
resolution: "canvas@npm:2.11.2"
dependencies:
"@mapbox/node-pre-gyp": ^1.0.0
nan: ^2.17.0
node-gyp: latest
simple-get: ^3.0.3
checksum: 61e554aef80022841dc836964534082ec21435928498032562089dfb7736215f039c7d99ee546b0cf10780232d9bf310950f8b4d489dc394e0fb6f6adfc97994
languageName: node
linkType: hard

"capital-case@npm:^1.0.4":
version: 1.0.4
resolution: "capital-case@npm:1.0.4"
Expand Down Expand Up @@ -13751,15 +13719,6 @@ __metadata:
languageName: node
linkType: hard

"decompress-response@npm:^4.2.0":
version: 4.2.1
resolution: "decompress-response@npm:4.2.1"
dependencies:
mimic-response: ^2.0.0
checksum: 4e783ca4dfe9417354d61349750fe05236f565a4415a6ca20983a311be2371debaedd9104c0b0e7b36e5f167aeaae04f84f1a0b3f8be4162f1d7d15598b8fdba
languageName: node
linkType: hard

"decompress-response@npm:^6.0.0":
version: 6.0.0
resolution: "decompress-response@npm:6.0.0"
Expand Down Expand Up @@ -14064,13 +14023,6 @@ __metadata:
languageName: node
linkType: hard

"detect-libc@npm:^2.0.0":
version: 2.0.1
resolution: "detect-libc@npm:2.0.1"
checksum: ccb05fcabbb555beb544d48080179c18523a343face9ee4e1a86605a8715b4169f94d663c21a03c310ac824592f2ba9a5270218819bb411ad7be578a527593d7
languageName: node
linkType: hard

"detect-newline@npm:^3.0.0":
version: 3.1.0
resolution: "detect-newline@npm:3.1.0"
Expand Down Expand Up @@ -23032,13 +22984,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"mimic-response@npm:^2.0.0":
version: 2.1.0
resolution: "mimic-response@npm:2.1.0"
checksum: 014fad6ab936657e5f2f48bd87af62a8e928ebe84472aaf9e14fec4fcb31257a5edff77324d8ac13ddc6685ba5135cf16e381efac324e5f174fb4ddbf902bf07
languageName: node
linkType: hard

"mimic-response@npm:^3.1.0":
version: 3.1.0
resolution: "mimic-response@npm:3.1.0"
Expand Down Expand Up @@ -23448,7 +23393,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"nan@npm:^2.12.1, nan@npm:^2.17.0":
"nan@npm:^2.12.1":
version: 2.17.0
resolution: "nan@npm:2.17.0"
dependencies:
Expand Down Expand Up @@ -29620,24 +29565,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"simple-concat@npm:^1.0.0":
version: 1.0.1
resolution: "simple-concat@npm:1.0.1"
checksum: 4d211042cc3d73a718c21ac6c4e7d7a0363e184be6a5ad25c8a1502e49df6d0a0253979e3d50dbdd3f60ef6c6c58d756b5d66ac1e05cda9cacd2e9fc59e3876a
languageName: node
linkType: hard

"simple-get@npm:^3.0.3":
version: 3.1.1
resolution: "simple-get@npm:3.1.1"
dependencies:
decompress-response: ^4.2.0
once: ^1.3.1
simple-concat: ^1.0.0
checksum: 80195e70bf171486e75c31e28e5485468195cc42f85940f8b45c4a68472160144d223eb4d07bc82ef80cb974b7c401db021a540deb2d34ac4b3b8883da2d6401
languageName: node
linkType: hard

"simple-swizzle@npm:^0.2.2":
version: 0.2.2
resolution: "simple-swizzle@npm:0.2.2"
Expand Down

0 comments on commit 67c7aa7

Please sign in to comment.