Skip to content

Commit

Permalink
Merge branch 'wf-main' into feature/custom-outside-click-predicate-wf
Browse files Browse the repository at this point in the history
  • Loading branch information
vabrahamyanadobe committed Mar 29, 2023
2 parents 2c4ec46 + 4bfedb9 commit c47fa35
Show file tree
Hide file tree
Showing 34 changed files with 3,912 additions and 1,000 deletions.
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
legacy-peer-deps=true
legacy-peer-deps=true
registry=https://registry.npmjs.com
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");

module.exports = {
stories: ["../**/src/**/*.stories.tsx"],
addons: ["@storybook/addon-storysource", "@storybook/addon-controls"],
addons: ["@storybook/addon-controls"],
core: {
builder: "webpack5",
},
Expand Down
2 changes: 1 addition & 1 deletion .storybook/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ addons.setConfig({
isFullscreen: false,
showNav: true,
showPanel: false,
panelPosition: "right",
panelPosition: "bottom",
enableShortcuts: true,
isToolshown: false,
theme: glideTheme,
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> :warning: **This is a temporary fork until our bug fixes have been merged into [@glideapps/glide-data-grid](https://github.com/glideapps/glide-data-grid). Afterwards the fork will be removed.**

<h1 align="center">
<img src="https://raw.githubusercontent.com/glideapps/glide-data-grid/master/media/icon.png" width="224px"/><br/>
<b>Glide Data Grid</b>
Expand Down
804 changes: 138 additions & 666 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "root",
"version": "5.2.1",
"version": "5.2.3-0",
"scripts": {
"start": "npm run storybook",
"version": "./update-version.sh",
Expand All @@ -22,6 +22,10 @@
"./packages/cells",
"./packages/source"
],
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.com"
},
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.9.0",
Expand All @@ -38,7 +42,7 @@
"@storybook/addon-actions": "^6.5.12",
"@storybook/addon-controls": "^6.5.12",
"@storybook/addon-links": "^6.5.12",
"@storybook/addon-storysource": "^6.5.13",
"@storybook/addon-storysource": "^6.5.12",
"@storybook/addons": "^6.5.12",
"@storybook/builder-webpack5": "^6.5.12",
"@storybook/manager-webpack5": "^6.5.12",
Expand Down
3 changes: 3 additions & 0 deletions packages/cells/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> :warning: **This is a temporary fork until our bug fixes have been merged into [@glideapps/glide-data-grid](https://github.com/glideapps/glide-data-grid). Afterwards the fork will be removed.**

<h1 align="center">
<img src="https://raw.githubusercontent.com/glideapps/glide-data-grid/master/icon.png" width="224px"/><br/>
<b>Glide Data Grid Cells</b>
Expand Down
2 changes: 1 addition & 1 deletion packages/cells/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/cells/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@glideapps/glide-data-grid-cells",
"version": "5.2.1",
"name": "@workfront-grid/glide-data-grid-cells",
"version": "5.2.3-0",
"description": "Extra cells for glide-data-grid",
"sideEffects": [
"**/*.css"
Expand Down Expand Up @@ -31,10 +31,10 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/glideapps/glide-data-grid.git",
"url": "git+https://github.com/workfront/glide-data-grid.git",
"directory": "packages/cells"
},
"homepage": "https://github.com/glideapps/glide-data-grid/tree/main/cells",
"homepage": "https://github.com/workfront/glide-data-grid/tree/main/cells",
"author": "Glide",
"license": "MIT",
"keywords": [
Expand All @@ -50,9 +50,9 @@
"canvas"
],
"dependencies": {
"@glideapps/glide-data-grid": "5.2.1",
"@toast-ui/editor": "3.1.10",
"@toast-ui/react-editor": "3.1.10",
"@workfront-grid/glide-data-grid": "5.2.3-0",
"react-select": "^5.2.2"
},
"devDependencies": {
Expand Down
3 changes: 3 additions & 0 deletions packages/core/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> :warning: **This is a temporary fork until our bug fixes have been merged into [@glideapps/glide-data-grid](https://github.com/glideapps/glide-data-grid). Afterwards the fork will be removed.**

<h1 align="center">
<img src="https://raw.githubusercontent.com/glideapps/glide-data-grid/master/media/icon.png" width="224px"/><br/>
<b>Glide Data Grid</b>
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@glideapps/glide-data-grid",
"version": "5.2.1",
"name": "@workfront-grid/glide-data-grid",
"version": "5.2.3-0",
"description": "React data grid for beautifully displaying and editing large amounts of data with amazing performance.",
"sideEffects": [
"**/*.css"
Expand Down Expand Up @@ -31,7 +31,7 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/glideapps/glide-data-grid.git",
"url": "git+https://github.com/Workfront/glide-data-grid.git",
"directory": "packages/core"
},
"keywords": [
Expand All @@ -49,7 +49,7 @@
"author": "Glide",
"license": "MIT",
"bugs": {
"url": "https://github.com/glideapps/glide-data-grid/issues"
"url": "https://github.com/workfront/glide-data-grid/issues"
},
"homepage": "https://grid.glideapps.com",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export default class ClickOutsideContainer extends React.PureComponent<Props> {
}

public componentWillUnmount() {
document.removeEventListener("mousedown", this.clickOutside);
document.removeEventListener("contextmenu", this.clickOutside);
document.removeEventListener("mousedown", this.clickOutside, true);
document.removeEventListener("contextmenu", this.clickOutside, true);
}

private clickOutside = (event: MouseEvent) => {
Expand Down
Loading

0 comments on commit c47fa35

Please sign in to comment.